Fix regression in commit 3a9b297 closing properties too early.