Minor refactoring in syntax.
Added empty /doc/haddock directory for generated Haddock documentation.