Convert more instances of 'set' to 'cmp'