Use clearer nil check? maybe?
Address mark's points on making spec less value oriented