Cleaned up shortcutter a bit.