Added a use namespace as for CollectionElement to get the TemplateMarkup working again

Do you mind the whitespace changes in this commit? If you do I will remove them. I have no unit tests added, but all your 32 tests still pass.