Cleaning up register inclusion.