Fix string allocation misalignment
Reformatting changes
Revert string alignment fix
Simplify and compact NEXT macro