Actions Dave's review comments from commit f864648.