Improved constant management in specs