Hint processing improvements

Pull request for issue #2793.