ors: minor cleanups (DO NOT MERGE)