Fix: More substitutions of blank? with nil?