[add] cleanup and enable sol safeties for function objects

[add] cleanup and enable sol safeties for function objects #535