Neat trick, thanks, I'll keep it around for the future. For now, everything is changed to either use tokens directly or use consumes + getByLabel (only one case of this).