I'll submit a separate PR -- feel free to close this one. Thanks!