minor regex fixes in hfile & cfile classes