Improved PSR2 support and comment handling