Follow up on #299

One small comment remains in that PR. Feel free to close this if the comment is a non-issue.