Added feedback from vkarnes.