Remove unnecessary language extension.
Add proposed architecture comment.