Cut down on some LOC, fix notices.