changed task expansion definitions to look more like normal production rules (I don't name individual constraints)