Style: Remove explicit returns

Use if-else instead. Experimenting with
different styles.
Fix: Make unsaved-data flag accurate on first go

We were blindly following $scope.$watch instead
of marking our unsaved-data flag when appropriate.