don't rename $collection vars

otherwise the method body is out of whack
be much more complete with App::uses replacements

Make sure that all use statements that can be determined are taken care
of automatically.
Comment but mark with TODO any unrecognised App::uses calls