Remove lots of leading underscores

Not an actual PR yet, I just want a buildbot build and the diff is too large -.-

Feel free to comment though.