Improved SMW 1.9 support, given a recent-ish change in the SMW code

Change-Id: I86221b85a84178e761685c3e3b0a7df633079455