Some simplification of the interface.