trivial appeasements of pc-lint
slightly more complicated fixes for lint
non trivial fixes for lint