- port of EE change
This style change enforces `return if ...` instead of `return nil if ...` to save maintainers a few minor review points