Fixed return-value of BeginModule{...} and EndModule{...}