#2390 - fixes for code generation

git-svn-id: https://chaste.cs.ox.ac.uk/svn/chaste/trunk@19680 b5f69653-2bf5-0310-8201-b0dafb8e1405