Nit: both of these vars are unused (was true on master too)