Merging in changes to add a cleanup method for Xooie.  Also fixed anonymous defines