Surely we shouldn't be using the very generic "sw" for such a
feature-specific part of the Writer code.

Change-Id: Id8913b9121a419f5da1f46a552fab95c903a3b13
(cherry picked from commit 8bc49ff1)