Code/comment cleanup.
Merge branch 'backtrack' into reuse-slug-numbers