Resolve Decorator Pattern in IFormFactor hierarchy

Joachim Wuttkerequested to merge
ff97 into develop

Simplifies things, and prepares for more simplifications.

Merge request reports