Resolve comments in PR#1320.