Possible perf. improvements.