[BUG #8486] generate checks map from Environment.add calls