Minor fixes for eventB-style