ngDocCode add more specs; discovered bugs D#2637 and D#2638