Better fix for RT #131270, fixes RT #131272
Better fix for RT #131270, fixes RT #131272

This breaks the latest added too specific tests for RT #131270.

jonathanstowe/rakudo,labster/rakudo,sjn/rakudo,MasterDuke17/rakudo,tbrowder/rakudo,MasterDuke17/rakudo,rakudo/rakudo,softmoth/rakudo,Gnouc/rakudo,Gnouc/rakudo,awwaiid/rakudo,awwaiid/rakudo,salortiz/rakudo,sjn/rakudo,labster/rakudo,salortiz/rakudo,usev6/rakudo,usev6/rakudo,salortiz/rakudo,tony-o/rakudo,lucasbuchala/rakudo,nbrown/rakudo,MasterDuke17/rakudo,rakudo/rakudo,tbrowder/rakudo,MasterDuke17/rakudo,Gnouc/rakudo,rakudo/rakudo,raydiak/rakudo,Gnouc/rakudo,raydiak/rakudo,awwaiid/rakudo,rakudo/rakudo,labster/rakudo,awwaiid/rakudo,lucasbuchala/rakudo,softmoth/rakudo,nbrown/rakudo,nbrown/rakudo,nbrown/rakudo,salortiz/rakudo,sjn/rakudo,tbrowder/rakudo,usev6/rakudo,jonathanstowe/rakudo,rakudo/rakudo,jonathanstowe/rakudo,tony-o/rakudo,Gnouc/rakudo,softmoth/rakudo,MasterDuke17/rakudo,softmoth/rakudo,tony-o/rakudo,usev6/rakudo,Gnouc/rakudo,nbrown/rakudo,labster/rakudo,labster/rakudo,raydiak/rakudo,sjn/rakudo,tbrowder/rakudo,salortiz/rakudo,lucasbuchala/rakudo,softmoth/rakudo,sjn/rakudo,lucasbuchala/rakudo,jonathanstowe/rakudo,awwaiid/rakudo,nbrown/rakudo,raydiak/rakudo,MasterDuke17/rakudo,jonathanstowe/rakudo,usev6/rakudo,tbrowder/rakudo,tbrowder/rakudo,rakudo/rakudo,tony-o/rakudo,lucasbuchala/rakudo,labster/rakudo,tony-o/rakudo,tony-o/rakudo,salortiz/rakudo