Fixing imp-hoare from master.