The exponential blowup in the compiler was fixed sometime since it was
made a separate crate, so things can be simplified by making it a module
rather than full-blown crate again.