Fixed dot-arguments; removed *module* hack