Sounds good - the if statement was just because I didn't want to mess with ``ScalarStatistic`` since you wrote it, but I can fix it since you mentioned it :)