ox: Tiny refactoring