IMPORT (kilobyte): A nicer assert message.

dtsund note: This imports two commits.