More steps towards working diwacs <-> state separation.