Fix class instantiation args bugs.