Remove unnecessary existential check; add return to fix javascript conversion.