In a few placed we directly use the L1/L2Client implementations and not the respective interface types. We should clean that up, as we soon need to rely on them more.