Cleaned up BIND_PER_PRIMITIVE and array indice usage