Improved internal handling of procedure labels