Minor matrix improvements (nested static_for still kill compilers)