Still investigating decode problem, cleaning up some OBE TODOs