Simple map-tail minimalism. Fixes #467