fixes and tests to support F90:R830/R831 nonblock-do-construct