Fixed one remaining issue with traces and not having a return value.