FIXUP: Refactor property setting.