Eliminated matchers_division, matchers_add, etc.; code clean up.