Cosmetic fixups to ORSet