More handling for optional geeknote arguments plus minor cleanup.