Revert some argument type changes which caused bugs and failed tests.