Correctly indent count variable and generalize to work on variant file only inputs #347