Implicit @FactoryProperties

Formatting will be a bit off as I had to use -Xignore-space-change when merging in a full code space-to-tab change.