Another pass at context clean up.