Address review comments from axw.