Some cleanups of the skeleton.