GH-72: some cleanup and changelog note
GH-72: use function bodies instead of special var