Change from pair to a struct

This hopefully makes the code easier to read. This also fixes a bug
where the check for non-constant was only between the first and last
workspaces.