Removing non-idiomatic usage of nil

 - albeit unconvinced this improves legibility
 - going with the flow :-)