Duplidate code cleanup, and fix parameters for unrenamed methods.