Disambiguate function boundaries.

Ref #18
Ref 0fdedfa5adf011f768df1d742f769501df7f16c4