some cleanups to modular task
some cleanups to modular task


Former-commit-id: f6bbbcdb1206c7f3b744fd3ac77e89368d64c7c1 [formerly 00a825c9ad8ab67313accfc864762dd8c1e3aca0]
Former-commit-id: 96cb2c533af88319f1ab37ab7a5fc05c734cae11
romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar