Pretty-well finished.

Still don't know why my null/nil checks don't work the way I expect
them.