Syntactic simplifications.

These changes kind of voids the README, so will rewrite that.