Merge "Move even more clinit code to reg functions"