Minor cleanup.
Simplify message assertions, don't use timestamps.
Control max_size, and remove some broken premature abstraction from the Makefile.
Merge bug24929