writerfilter: Kill unnecessary indentation (return or continue early).

Change-Id: Iad20b8f9b453d413ce0d249c65b5f44767f0264b
writerfilter: Old Python does not know OrderedDict, work that around.

Change-Id: I08fc7ba8e94d3d258f9e00ac45cd1a8a0b6b3ff3