Clean up compile, fix bug with handling variants.  Closes #8