Simplify dump_status()
map_action() refactoring