Clean up hinting a bit.

Use a sentinel value so we can always check hints without an
extra branch.