Re-add App::uses() and fix tabs.