Tidied boundary conditions for emotime, emomoon