Refactor reST mappings and use nonrecursive maps