Better management of manually-set members.