Also clean up some comments. We now have types in constraints, but are still using values from context.
