Changes from comments in PR#443