More Z-code HTML massaging