Shared code clean-up. One more and I suppose it's done.