Minor tweaks.
Small fix for determining return types on the front-end.