split and move stuff for mutable-match-lambda