Upgrade schema and plumbing dependencies

Main changes are that macros in schema.macros have been moved to schema.core.
Either way, was really just making sure I'm not missing something :)