Shave off a few more cycles; remove some cruft.