Tweak and tidy up the hashless quirk