Ecpoint q

See commit coments.