Inlined map definitions and got rid of --no-termination-check stuff.