More refactoring of app class to deal with conflicting arguments.