UNSTABLE: match helper refactoring