SQUASHME: address comments by @kijewski