Sync with background param API changes. Some minor syntax cleanup.