The stapsdt line count is now too high, because readelf also prints that it's in the .note.stapsdt section. Look for NT_STAPSDT instead.