Sundry cleanup.
THERE. Whoops.