minor refactoring, new FIXME comment
removed no longer required parameter
new TODO comment
cleaned up (well, sort of) the NewValue mess