SQUASHME: address @hunse's feedback