Refactoring and additions related to hint experiments