Move GetEffects/SetEffects to be class-associated.  Plus general cleanup.