Fix docblocks

Few DocBlock fixes with inconsistent variable names, return types, and varadics.