Completely removed instance vars from Handler class methods.
Merged from-class-to-instance.