Cleaner, non-recursive mappings