minor cleanup of not nil? forms