Some minor changes to prepare for restructuring.