Fix datasource path after package change.
Eliminate some unneeded casts.