properly disable map in irrelevant branches, closes #17