Other minor cleanup.