Finishes optionality of navigationhistory, ref #176.