US682 Fixed some nasty dependencies between vals.