Hygiene: Pass block instances rather than the factory

It seems silly to pass the factory in here, we only want one set
of blocks to use for a submission.

Change-Id: I28ab6f4320e0e4c1ddbc6f7b15315bc0ab04397d
Merge "Hygiene: Pass block instances rather than the factory"