Refactored environment shortcut construction and verification. Implemented uniforms semantic matching.