More Linux cleanups -- we don't like the auto keyword yet :(