Got rid of recent O_TEXT* and O_BINARY* changes.