Changed some Fixnum checks to Numeric, and allow the possibility of nil in some tests.