SMW upgrade to 1.8

Funny... I was certain I merged this a while ago. Huh.