Refactor Snap.Plus (from SnapPrelude and friends)