Quick edit to note that this is untested.
Rip out Carbon.
Small fixes.