Better type inference for captured blocks whose return type doesn't matter
Added some TODOs
Continued oauth