Improve constructor calling and handle implied this