Some tidy up of header locating code.