Inclused re-declaration fixes for some places which I got wrong in the past.
Attach a file by drag & drop or click to upload