P4: Use config.error, instead of collecting errors by hand.
P4: Use tools provided by CompositeStepMixin.
Merge pull request #767 from tomprince/p4-cleanups

P4 cleanups