Cleanup and use inline for addition of flint poly and int.