Implemented better fix for 'Bug 10830 - @null is displayed as var
type'.
Updated nrefactory.