More cleanup of Handbook output