Minor compiler code cleanup for multifile directive compilation