@ehelms the difference is leaving out environment_id is unlikely to occur, this error occurred in 5 different places.  My preference over consistency is error-free functionality, so I would rather keep someone (or 5 people) from making the same mistake in the future than keeping things consistent.  So i would rather have a discussion around that.