Final tidy-up, including the statsd santizer