Issue #305

Yeah. The original turned out to not be as readable as I thought when I wrote it.