Whitespace
Don't attempt to generate protocol methods for nowait versions
Compile
merge bug26208 into default (again, to fix build)