MAINT: address review comments from Josef on PR-562.