With the new dev build we've got the updated linter and so can use the `@optionalTypeArgs` annotation (in `meta 0.12.0`).

Bonus: this lets us clean up one more Regexp in the `analyze` command! :)