Tidying up, start of fix for '0-width chunk' problem