fix return type assertions & arrow functions

/ref #1443