Moved DiscardMarkupHandler to its own package.
Minor refactoring and added javadocs to seletion artifacts.