Improves clarity of nil check
Improves strength of assertions per @myronmarston's suggestions