Clean up the is_a?() stuff