For #1, passing substitution and suppression thereof onto...

...MapPropertySource and ResourceBundlePropertySource, if the value in
question is a string.