I lied. Removing priv, changed a few more *T to *const T, going to check all priv first