This MR is mostly for tracking purposes right now - it definitely depends on !304, and I'm happy to wait for !296 (merged) to go through as well before rebasing.