Fixed results for one-line functions that call other functions.

This fixes #1, and adds a unit test for the failure case.