minor cleanup: include orders, end comments etc.

- no code changes

@laanwj This should be really uncontroversial this time, so perhaps you can just merge it.