Repaired a few annotations/generics/if to switches