Incremental: use schema value type everywhere

Signed-off-by: David Scott <dave.scott@eu.citrix.com>