Refactor ClosureComponent to contain a weight directly.  So a
w*closure tends to just be a single ClosureComponent, not a separate
MUL and COMPONENT. This simplifies things a bit and removes some
overhead from closure construction.