Making our code slightly less typesafe to work around a bug in javac.

I couldn't reproduce the specific bug on various versions of javac (1.6.0,
1.6.0 r1, 1.6.0 r13, 1.6.0r16, 1.6.0 r15 on Mac, 1.5.0 r20 on Mac) so I'm
just hoping this change works.
6 files changed