Architect: some useless microoptimizations

This commit is just to test ISC license is OK, and that GitHub works.