Fixed a bug where the property association wizard did not add necessary
with clauses.