Minor cleanup and making sure that calls that should always return Arrays do.
Merge branch 'master' into version1