Expat wrapper is now in separate src subdirectory