I thought the if clause was getting a little ugly.
Happy to change to yours for semantics closeness.