Out with old, in with the new, better BatchMaker markup.