Fixed NF subscript composition handling. It is correct now (I hope).