STY: Changed idiom for filling matrices as suggested by pv.