Little code reorganization.