SQUASHME: coding conventions fixup