inline some blocks, change some sqwiggely blocks to dos and ends and whitespace removal
inline some blocks, change some sqwiggely blocks to dos and ends and whitespace removal

envato/event_sourcery-postgres,envato/event_sourcery-postgres