Cleaned up handling of publishing and revisiting options.