Remove m4 and rely on autofoo to pull them in