Minor cleanup and making sure that calls that should always return Arrays do.