Slightly simplified version. Thanks to @dimsumthinking and @bjmillerltd for spotting my original mistake.

#swift #refactor