Tidying up control injection.