Merge in recent development:
1) optimization_mode()
2) More efficient singleton Method forwarding