Comments and a bit of initialization order cleanup.