Hygiene: Separate toggling code into own module

Drop the mf- prefixes
Reinstate references and last edited tests
Drop unused messages

Change-Id: If19e0eb03fe9014e444a025e21d98ef861763e4f
Merge "Hygiene: Separate toggling code into own module"