* Shortened type references * Removed redundant 'this' qualifier
will happen on the windows side now that eol-style is correct