Continue piecemeal hackery.