fixed (hopefully) sizing of subfigures
make sure default values are set for \countdef, etc
Be sure to include braces around apparent arguments in \@expandtwoargs