Factor out some common code between OCPP 1.6 and 2.0.1 stack