Tidy up/fix Hints thread in a couple of ways: