Update to work with latest version of foreigner

Also code cleanup and added support for :nullify