Apply AlisdairM review comments