Micro opts

this depends on #7 .  Not strictly necessary.  No performance numbers to compare before/after.  Should be tested with large working example, but looked good to me.