nvm, clean install turned up two unrelated errors in master and your PR does the same, so this looks good.