Sure, I can take care of that. First pass posted on the bug.

If you want to review swap, I've got this one in the queue. A few people have commented, but so far no one has assigned it to themselves.

https://bugzilla.redhat.com/show_bug.cgi?id=2439787