Issue 4022: More detailed orphaning warning
Issue 4022: Moar grammar
Issue 4022: Fixed HTML
Issue 4022: Hopefully fix the test
Merge pull request #1723 from LadyOscar/issue_4022

Issue 4022: More detailed orphaning warning