This completes (many!) changes resulting from reviews over the