Improve RETURN statement formatting

[nene]

Currently when RETURN statement contains AND, it gets formatted as:

RETURN is_valid_modular_roof_instance_properties(properties)
AND is_valid_modular_roof_prototype_properties(properties);

Instead the contents of RETURN should be indented:

RETURN
  is_valid_modular_roof_instance_properties(properties)
  AND is_valid_modular_roof_prototype_properties(properties);

Or maybe it should even be wrapped in extra parentheses:

RETURN (
  is_valid_modular_roof_instance_properties(properties)
  AND is_valid_modular_roof_prototype_properties(properties)
);