Tweaking things a bit to fix some issues I encountered when wrapping Quicksand in SMC.