More option printing fixes.