Minor cosmetic changes
Added remaining cases for arbitrary.  This completes Core.