Move more definitions out