Add underscore stripping to YAML idiosyncrasies
Remove trailing whitespace
Cleaning up docs for #6084
match return that you will get