Add implicit sandbox, adjust macro slightly