Add a few optimization hints #189