Significantly simplified the implementation of the canonical solution.