I wonder if it wouldn't be better to move to properties-based connections. (Would allow easier switch to other db instance if this is desired for some reason).