Couple of cleaning patches from @zeenix from the interlacing branches which could already be merged as it.