Minor refactor to make applying patches from 'Add a "probe-stack" attribute' review thread out of order easier.