Squashed commit of the following:

commit d665a6a8544c38c9669df0547a3dd36a0254d1f8
Author: José Fonseca <jose.r.fonseca@gmail.com>
Date:   Wed May 7 22:34:25 2014 +0100

    Cleanup.

commit a945a2228289589498d385a6dca260a78f74122f
Author: José Fonseca <jose.r.fonseca@gmail.com>
Date:   Fri Jul 6 16:07:46 2012 +0100

    Cleanup the code.

commit b44cc724c46fa7753320fd4675430c322080fd9f
Author: José Fonseca <jose.r.fonseca@gmail.com>
Date:   Fri Jul 6 15:52:29 2012 +0100

    Adjust messages.

commit 911bb01e5ab1c5d394ab3f32324e084ba7ee87c8
Author: José Fonseca <jose.r.fonseca@gmail.com>
Date:   Fri Jul 6 14:25:39 2012 +0100

    Several fixes to defer.

commit e0b5ce85bba229bcb46f154ae814aef9fc3217c1
Author: José Fonseca <jose.r.fonseca@gmail.com>
Date:   Thu Jun 28 10:41:11 2012 +0100

    Defer dumping.