WX refactoring.