Merge lquid's prettification changes