Finally got around to commiting this.