rpearce: Minor re-ordering, add missing publics