Fix #4 changing to Dispose on streams; cleanup bad using statement.