Improve SpreadLayout and StorageLayout derive macro hygiene (#926)

* miscellaneous improvements to macro hygiene in derive macros

* fix storage_derive UI tests
22 jobs for master in 31 minutes and 17 seconds (queued for 8 seconds)
Name Stage Failure
failed
ink-waterfall Ink Waterfall

Triggered pipeline status is running

Triggered pipeline status is running

Triggered pipeline status is failed
Something's broken in: "https://gitlab.parity.io/parity/ink-waterfall/-/pipelines/158189"
Cleaning up file based variables
ERROR: Job failed: command terminated with exit code 1