Renamed lie -> expectation in source, and minor cleanup