Heh... perhaps I shouldn't have been so cowboy when merging this.