#153. Statistics slightly refactored.