Put the borland workarounds back - it still seems to need them. Will probably have to do something else on top of this for any problems this causes.