chore(annotations): Undeprecate some annotations

@Controller remains deprecated.

For #1186

Closes #1198