Misc rewriting. Add an explicit MUST.

@marcoscaceres, can you have a look?