MAINT: more work on the plain Markov chain code