Cleanup hexadecimal support, using Guava