Bit of cleanup, verifying what causes #338