Add @uses tags for --strict mode.

Whoops missed these!

Unfortunately, I had to specify the full class name in these uses tags.
Use components() method rather than direct access.

I want to keep things open for easy extension, and components() should
be used to allow overriding.