Fix ordering of serialize and deserialization of fields
Write out basic block info only for full Contech instrumentation