NHA: Improve lookup of message types where the type is known but does not follow convention. Closes #37.