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)