Make angle overlay construction simpler