mescc: scaffold: misc cleanups.