Minor cleanups, nothing much to mention.