Stop using Optional for non-return purposes, and fixes two == compares

[mbax]

Even if you decide to ignore the Optional commit, it's worth fixing the two lines in the other commit :)