Slightly better trap-error.
Only add irritants to error message if there are any
Optimize out unnecessary wrapper lambdas.
Update Changelog