Simplify the rules used to specify dist