Refactor code a bit also so we need to do fewer matrix transforms for shader data setup of points and curves.