Support module subtypes in completion (closes #3288)