+1 for using the numbers module more. Are there numpy types it doesn't catch?