Fixed some generic annotations that were causing compilation failure under Java6.