Clean up remaining get_class() uses