Streamlined the type interface. It now matches the LaTeX description.