Fixed style problems, bandaided cpplint infinite recursion.