Simplified call to SMW subobject code, based on recommendation from MWJames

Change-Id: I06a5fcb5ace44c144972814675422f7db2696d8d