Simplify the usesLeft logic
Fix improper decrement
Fix imports
Remove redundant SupplementaryTypes.INTEGER in favour of CoreTypes.INTEGER