More intermediate c2-nei stuff.
--amend