Add [options] to the four "eval" methods. Corresponds to changes from bug 889627