Improvements on callable detection