Code simplifications after moving to indent counting