Cleanup and renames, removed has_nulls(…)