Reduced cruft.