Per patch from Tetsuya Mishima, complete the overhaul of the round-robin mappers

Refs #4296