Cleaning up some semantics. And this seems to work now...