Adapt stop stack to stop types