Oid revamp

Some nitpicks I've been thinking about.