A bit of cleanup in shared code.