simplified source (typedef => using)
Strings are now aligned during replacements -- decls are now correctly replaced