More re-wiring and tidying.