Rearranged combinators to be in header defined order.
Fixed traceback generation.