Optimiser placation.

[originally from svn r7625]