Fix GenericMeshState, add WhaleState.