Re-define nil as nullptr, cleaning up some potential issues along the way