Adrian and I talked about that and we agree that we should make the switch. We'll do it in one big search-and-replace bug later.