Improvement in internal helpers.