Add support for #4277.  Fix some line lengths and indentation.
Add support for #4277.  Fix some line lengths and indentation.

gmarkall/numba,cpcloud/numba,numba/numba,stuartarchibald/numba,cpcloud/numba,IntelLabs/numba,IntelLabs/numba,seibert/numba,cpcloud/numba,IntelLabs/numba,numba/numba,stonebig/numba,gmarkall/numba,seibert/numba,stonebig/numba,IntelLabs/numba,seibert/numba,numba/numba,gmarkall/numba,numba/numba,stuartarchibald/numba,stonebig/numba,cpcloud/numba,IntelLabs/numba,stonebig/numba,stuartarchibald/numba,seibert/numba,stuartarchibald/numba,cpcloud/numba,stonebig/numba,numba/numba,stuartarchibald/numba,seibert/numba,gmarkall/numba,gmarkall/numba