Oops, last commit only included the -new- files. This also removes EExpander, which is no longer used.