Address review comments by waigani.