@cpennington I made a pass at cleaning these statements up. I don't believe I can do exactly as you suggest as invitation_only should not affect CourseEnrollmentAllowed and has_staff_access. Also, the dates may be null.