Tweaks for next rakudo release