Cleaned up handling of hex-digit escape syntax