Add support for comment-preserving transformation