Various cleanup to fast sine