Tweak custom-keys, kill cruft.