Get inclusion arguments explicitly.
Add tests and some minor tweaks.