Fix property list handling for u.f.o..

This replaces pull request 1021 and is mergable.