[PATCH] Add and clarify matrix workarounds.