Restructuring of code to support polite numbers.