SQUASHME: fix nits