Misc changes.
Limit the extra trace parameter to Double for now.