Small cleanup for VCRFrontEnd