Refs #10348 Refactor hint map creation