Minor fixes to previous change introducing switch -H, as per comments
on -arch.

Reviewed by:	gleb