Shouldn't this `@todo` comment should refer to the current issue (#591), since it's a continuation of that?