regurgitate.cpp: cleaned up some nasty declarations