[REF] Cleanup on permission code

[REF] Cleanup on permission code

The function returns either an array of arrays or an array of the
first key in the array, depending on the 'desriptions' parameter.

This cleans it up so that instead of handling the descriptions
parameter in multiple places we get the array
in all cases and do the formatting at the end