More cleanup. Use Debug.Assert instead of NotImplementedException.