Code layout correction, also removed base class for typedef detection; additional complexity for no benefit
Remove explict metafunction classes in favour of placeholder expressions