Simplification of Classification and Hint API (and a little extra cleanup)

Stack-overflow, yeah. Fixing.