Fixed style violations introduced by 0.8.2 merge.