Remaing bits of PR:620 relevant to 0.9.8.