Replace table with list; add canonical commutation relations.