Minor tidying up to match my fork of foxslide.