minor

Remove type guards on some fallback code. Fold unneeded type guards on
a minor operation.