Applies minor changes (e.g. code formatting, closing InputStreams) discovered while briefly looking at issue #854: Avatar handling is flawed.