LGTM
https://codereview.appspot.com/573420043/diff/575530043/lily/main.cc File lily/main.cc (left): https://codereview.appspot.com/573420043/diff/575530043/lily/main.cc#oldcode515 lily/main.cc:515: // SCM result = scm_call_1 ( I guess you are submitting two commits as one Rietveld issue, right? To me, the changes in the two files look unrelated. https://codereview.appspot.com/573420043/