Quote pattern form; Fix else branch in macro