accidentally added some typedefs to the marqov namespace; this essentially reverts the last commit

5 jobs for 38-separate-out-metropolis in 6 minutes and 12 seconds