Fix up paths after r253790.
While here, use $? contraction.

Reported by:	O. Hartmann