Merge "Clean up property setting code."