Tried to clean up err handling

- Removed redundant int err declarations.

- Preferred combining "if (err)" conditions such that err gets tested
  before any gotos/breaks/etc. The compiler is smart enough that this
  doesn't improve code size, but it does make the code more readable in
  places.