Minor changes following own CR.