Refactor fab confirmation guards to be DRY.
Merge branch 'master' into init-map