Rename two function-style macros, removing the word "inner". This makes things more consistent.
Attach a file by drag & drop or click to upload
