WYCS: making some progress tidying up the interface.