Some har.c refactoring.