Switch to clearer if ... present?