Removed callable check, added isDefined rather than horrible list().