Switching to more explicit composer constraints