removed superfluous ensure_ macros
temporary leave retaddr and file_close call out, for 0.5.1