odt: Reduce instructions.
And other miscellaneous fixes.