Clean up a few imports.
'int' cast is now part of Number module.