First cut at consolidating TCB updates during initial setup.