Change.newValue/oldValue now return Option; code cleanup