@Constellation: done. Though I don't like that style. Too verbose for me.