Only set default kind in one place

It's in NoticeFields now. Also add a little TODO.