BUG-1668: split the writeout paths

This makes the writeout paths more explicit and adds a FIXME.

Change-Id: If4ca9a098dfae49b7833a787555103d57068330e
Signed-off-by: Robert Varga <rovarga@cisco.com>