Move our GWT stuff around.

This avoids having it look like normal Java source and then confusing tools
because there are two copies of DefaultCollector.