See #9, but yeah--it was just moving code around.