It works!!! @swannodette

The last commit was incomplete, since I wasn't keeping the
constraint. :-)