Fix conditionals, stop splitting NilClass