Various cleanups to device inbox store.