cfnet clean-ups

Well, mostly cfnet anyway; a few clean-ups I've done on other files were mixed up with them, so this includes other changes to those files too.