Rearrange init code slightly.