Better handling of php tags and comments