Converted desired dividend to at-retirement value discounting (see #2), tweaked namespaces