Switch to arrayify. Fix JSHint issues.