Move property observers out of generates