"Optimize" imports

(That's what IntelliJ calls it.)
Switch to a more exotic charset in test
Switch to a protocol and dynamic var for more pleasant code :)