Port all remaining self.protected_instance_variables to class methods