More context switching tweaks.