Fix bug in hints and simplify code

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D10750