Minor cleanup.
Doesn't work.