Another stab at #455
More in-use status flag tweaks