Added feedback from Tom on "on nil" semantics.