[feature] Improved yet defunct comment support.