LIbrary no longer handles initialValues, that's handed off to implementor. Some code tweaks and cleanup