Fix 'when' now that #14 is in.