Allow range options to accept 2-PDLs; add appropriate tests