Fix up some unfinished business with prefixed conversions.