Cleanup/reshuffling of various combinators