Updated files in tracker/ to work with recent refactoring. Doesn't quite compile yet, though.