Removed useless optimisations and added some more - a little less useless.

Signed-off-by: Damien Zammit <damien@zamaudio.com>