Replace hex in more places.

Reported by:	@samoht