some incomplete matcher rewrites
More matcher rewrites
matcher rewrites cleanup
add format hint for numbers and filter doubles