This allows us to finish the cleanup started in 0b3bb10 and inline setupProcessors. Change-Id: Ia7840091607e9a75153031b5db7600d5a0018da6