Issue #18 - Don't wrap boolean returns inside if statements