Small rewrite.