Matrix: Fixed remaining issues with providing numerical factors of different scalar types.

Supplements 80697cf13dc2c80bdb676a233766281e678ac276 and addresses #71.