Follow logical consequences of the always-NULL.

And, depressingly, big slabs of the IA2 caption code
in writer doesn't actually do anything.

Change-Id: I35f7ffac19db683010b656b3c88f81b65233b080