Minor refactoring of the Debug builder
Merge pull request #744 from twitter/debug-items

Minor refactoring of the Debug builder