More store code cleanup
Factor out accountbound bool