Yes, we should try to move common stuff there to make the implementations more consistent.