Bugfixes--propn defs now all work.