IMHO, deprecating map_function for map_tokens is fine.
The map_inlines, otoh., are handy and reduce hash-table flooding. If you deprecate these you always need to define an auxiliary for every loop, and if you re-use an internal need to keep track of scoping yourself.
Maybe reduce to <type>_map:[Nn]n for the tokens version plus <type>_map_inline:[Nn]n for the inline version.