Code clean-up.

Added marks (!!! yield !!!) where long trunk chains may stuck
the scheduler thread.