otter-common: overlay: More cleanup