Implement .map(*) and map(*,...)

Mostly for consistency's sake and the fact that proto's are much cheaper now