Remove CONFIG_GRAN_SINGLE.  It adds no technical benefit (other than some minor reduction in the number of interface arguments) but adds a lot of code complexity.  Better without it.