There's a bunch of unwrap()s and expect()s which aren't the prettiest, so…

Scheduling: after #91 then #61 then #93