More work on loop support.