General cleanup, matching updated version of lime:next