Fix bug where self.constraint was sometimes never set.