Generalized context base type finder to ASTNode.
Merge remote-tracking branch 'origin/master'