Clean up and add -I top level help function.