Address review comments for issue #481.