add '_has(...)' functions where they were missing, and cleanup existing ones