Some tidying + testing in Time plugin.