A few context tweaks.