Misc #0000: Minor cleanup.