Shorter, reformatted post-proceedings version