Some cleanups and smartassV2 tweaks.