[3] : Explicit type in function expression.

Added explicit types and propagated to tests and extraction.