Refactored \"if\" expression in preparation of making \"do\" keyword mostly optional.