Revert "Some minor cleaning up."
Revert "Some minor cleaning up."

This reverts commit dc154645840c952215cd0a76a3048eaa76d1917e.

hsorby/libcellml,nickerso/libcellml,MichaelClerx/libcellml,nickerso/libcellml,hsorby/libcellml,cellml/libcellml,nickerso/libcellml,cellml/libcellml,cellml/libcellml,hsorby/libcellml,hsorby/libcellml,MichaelClerx/libcellml,cellml/libcellml,MichaelClerx/libcellml,nickerso/libcellml