Slightly reduce awfulness of command code storage