Fix several alignment issues

Simplify logic for inserting part/phrase counts (A1, B2, etc.)