General cleanup; see websharks/s2member#151