More changes to instruction reader and writer, but not yet handling special cases properly.