Move block yield within property loop