Clean up context equiv. stuff a bit