NH-3667 & NH-3102 Dictionary mapping-by-code improvements

https://nhibernate.jira.com/browse/NH-3667
https://nhibernate.jira.com/browse/NH-3102

For readability, can we get that split on several lines please? Use a nested if-statement if it helps readability.