WINTERMUTE: Further refactoring.

It's now almost good.
This commit and its parent and possibly its child are gonna be squashed
together in the near future.