Cleanup.

Fix some label suffixes, ensure intent of asserts is documented.