Re-roll patch to take into account the comments in #25.