More cleanup, and making sure that the remainder finding works for small primorials as well