@mdboom - Yes, correct. Another reason to implement #1427 (where referencing it here should help ensure it happens...).