use a guarded if instead of scoping the body inside the if. This will reduce the diff when merging and makes the semantics of the if cleaner.