Cleaned up, ready for crazy unicode spike.