Ya, still ugly. I did the minimum I needed for API compatibility, fixed a bunch of i18n errors, but otherwise didn't let myself get caught up in any other changes.