Simplify generation of HintsTable

Fixed in response to code review comment