general cleanup around statements. unit tests passing again.