some hacks and cleanups to fix collect! error for finding email addy.