Make substitutions table more compact