Remove unused Shake Key type
Fix test to show type-specific annotation lookup
Replacing more instances of OrdList with HsCommaList in parser