Make these public to facilitate future merges.