The context rules seem to mostly work now.