Merge "Move more clinit code to registration functions"