Changed entirely to metadata-based stack-types.