Cleanup example a little. #1424