Clean up unused variables and VIM directives.

A good point. Got rid of unused return values here and at another place.