Cleanup after https://github.com/sferik/t/pull/180