[MS][00000000] Refactor to clean up params passing.